chore: Update main from develop #471
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* fix(dashboard): web-nfc toasts and api call Fixes the unclear messaging of the toasts, now specifies if you are on desktop or mobile, and if you are on mobile it will give details depending on ios or android. Additionally the nfcCode is now consistent with the POS. * fix(dashboard): remove accidentally commited files removes accidentally commited files. * fix(dashboard): fix in if statements deciding which toast fixes small logic error in the if statements that decide which useragent gets which error toast. * code(dashboard): Clean up code and change error messages * code(dashboard): fix nit about nfcCode fixes the nit about the nfcCode and makes the function call more neat. --------- Co-authored-by: Job van de Ven <[email protected]>
Bumps [marked](https://github.com/markedjs/marked) from 11.2.0 to 15.0.1. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](markedjs/marked@v11.2.0...v15.0.1) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@stripe/stripe-js](https://github.com/stripe/stripe-js) from 4.10.0 to 5.2.0. - [Release notes](https://github.com/stripe/stripe-js/releases) - [Commits](stripe/stripe-js@v4.10.0...v5.2.0) --- updated-dependencies: - dependency-name: "@stripe/stripe-js" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* feat(seller): Permission based rendering * feat(permissions): Permissions isAllowed function * refactor(permissions): Added new meta for permission on routes * refactor(permissions): Router guard based on permissions * refactor(permissions): NavBar based on permissions * feat(permissions): Permission based rendering for the products * feat(permissions): Permission based rendering for the point of sales * style(routes): Fix indenting * fix(routes): Fix typing * fix(permission): Fix nits
* feat(dashboard): Created invoice account overview, including balance Sorting could still be implemented * feat(dashboard): Only show invoice accounts with negative balance (#462) * feat(dashboard): Moved overview to invoices page and automatic invoices Also we updated the number next to invoices to be the amount of open invoice accounts. * feat(dashboard): Now also filter out inactive users from the overview * feat(dashboard): Small fix of an error * Auto stash before checking out "origin/develop" * feat(dashboard): Remove unnecessary code * feat(dashboard): Remove duplicate code * feat(dashboard): Bugfix * feat(dashboard): Final fix * feat(dashboard): Real final fix --------- Co-authored-by: Noël van de Vrie <[email protected]>
* feat: SudoSOS wrapped * chore: i18n
|
Triggered from #471 by @JustSamuel. Checking if we can fast forward Target branch ( commit f54605b57d77164f47bdd6d4a4321cc997e5f688 (HEAD -> main, tag: v1.10.1, origin/main)
Author: Samuel <[email protected]>
Date: Tue Nov 12 16:03:56 2024 +0100
fix(pos): mistake in vite config (#451)Pull request ( commit dfb3b6356f241b0d1f5fe65028e638d88cf74449 (pull_request/develop)
Author: Victor Klomp <[email protected]>
Date: Wed Dec 18 19:13:46 2024 +0100
feat: Wrapped (#470)
* feat: SudoSOS wrapped
* chore: i18nIt is possible to fast forward |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
People have been waiting for this, asking about it, and now it’s finally happening. The merge of develop into main. It’s a big deal, a huge deal. Everyone’s talking about it, and they should be. This release is going to change everything. So many features, the best features, features you’ve never even dreamed of. People are saying it’s one of the greatest releases ever. Nobody does releases like this team, nobody. We've worked harder than anyone to make this the most amazing thing you’ve ever seen. When you see it, you’ll know. The attention to detail, the innovation, the brilliance—it’s all there. This is what happens when you have the best people working on the best ideas. Just wait, you’re going to love it. Everyone’s saying it, and they’re right. This is going to be something special, something historic.